Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Fri, 7 Jun 2013 13:55:28 +0000 (21:55 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Fri, 7 Jun 2013 13:55:28 +0000 (21:55 +0800)

Trivial merge